Rob Browning [Mon, 5 Sep 2016 20:06:52 +0000 (15:06 -0500)]
Update debian/changelog for 24.5+1-7 release
Rob Browning [Mon, 5 Sep 2016 20:00:48 +0000 (15:00 -0500)]
Support glibc 2.24
Add 0022-Emacs-should-work-with-glibc-2.24-on-ppc64.patch to incorporate
the relevant upstream code. Thanks to Aurelien Jarno for reporting the
problem and backporting the fix.
Closes: 833727
Paul Eggert [Fri, 15 Jul 2016 11:07:09 +0000 (13:07 +0200)]
Emacs should work with glibc 2.24 on ppc64
This patch, backported from upstream by Aurelien Jarno
<aurel32@debian.org>, has been added:
Port to glibc 2.24 (pre-release) + ppc64
Inspired by a suggestion by Florian Weimer in:
https://sourceware.org/ml/libc-alpha/2016-07/msg00425.html
* configure.ac (HAVE_PERSONALITY_ADDR_NO_RANDOMIZE):
Rename from HAVE_PERSONALITY_LINUX32, and check for
ADDR_NO_RANDOMIZE (the crucial thing) instead of for LINUX32.
All uses changed.
* src/emacs.c (main) [HAVE_PERSONALITY_ADDR_NO_RANDOMIZE]:
Use ADDR_NO_RANDOMIZE from personality.h rather than inventing the
flag ourselves. Just set that flag, rather than also setting the
persona. When doing it, avoid functions like putenv that may
allocate memory.
Origin: backport, commit:
e95b023163e96538b15f030b7176b7ec59cf86f5
Bug-Debian: http://bugs.debian.org/833727
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Mon, 5 Sep 2016 19:39:00 +0000 (14:39 -0500)]
Fix malloc handling with newer gcc (>= 5.2)
Add 0021-Emacs-should-work-with-gcc-5.2-and-newer.patch to incorporate
the relevant upstream code. Thanks to Aurelien Jarno for reporting the
problem and backporting the fix.
Wolfgang Jenkner [Sat, 26 Dec 2015 20:12:02 +0000 (12:12 -0800)]
Emacs should work with gcc 5.2 and newer
This patch, backported from upstream by Aurelien Jarno
<aurel32@debian.org>, has been added:
Always define gmalloc etc. in src/gmalloc.c
This is a work-around to prevent the compiler from using semantic
knowledge about malloc for optimization purposes. E.g., gcc 5.2
with -O2 replaces most of calloc's definition by a call to calloc;
see Bug#22085.
* src/gmalloc.c [!HYBRID_MALLOC] (malloc, realloc, calloc)
(aligned_alloc, free): Do not undef. Instead, define these as
functions (perhaps renamed to gmalloc etc.) in terms of gmalloc etc.
Origin: backport, commit:
4b1436b702d56eedd27a0777fc7232cdfb7ac4f6
Bug-Debian: http://bugs.debian.org/833727
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 4 Sep 2016 18:52:14 +0000 (13:52 -0500)]
Restore GTK+ toolbar icons
Add 0020-Emacs-should-show-GTK-icons-again.patch to include the relevant
upstream code. Thanks to Juerg Haefliger for reporting the problem and
pointing out the relevant upstream commit.
Closes: 828000
Jan Djärv [Sat, 18 Oct 2014 16:19:53 +0000 (18:19 +0200)]
Emacs should show GTK+ icons again.
This upstream patch has been added:
Handle deprecated Gtk+ stuff for version <= 3.10
* lisp/term/x-win.el (x-gtk-stock-map): Add icon names suggested as
replacements to stock names before stock names in a list.
Cdr may be a list, each name is tried in turn until one is found.
* src/gtkutil.c (XG_TEXT_CANCEL, XG_TEXT_OPEN, XG_TEXT_OK): New defines
to handle Gtk versions.
(xg_get_file_with_chooser): Use them.
(xg_have_tear_offs, tearoff_remove, tearoff_activate): Remove
(create_menus): Remove teroff argument and code.
Remove call to gtk_menu_set_title.
(xg_update_menubar, xg_update_submenu): Remove tearoff code. Adjust
args to create_menus.
(xg_tool_bar_menu_proxy, xg_tool_bar_detach_callback)
(xg_tool_bar_attach_callback, TOOLBAR_TOP_WIDGET): Remove.
(xg_pack_tool_bar): Replace TOOLBAR_TOP_WIDGET, remove detach code.
(xg_make_tool_item): Remove detach code.
(xg_update_tool_bar_sizes): Replace TOOLBAR_TOP_WIDGET.
(find_icon_from_name): New function.
(update_frame_tool_bar): Remove GtkStockItem code, move to
find_icon_from_name. Let stock be a list of icon names to try.
Only use gtk_image_new_from_stock on Gtk+ < 3.10.
Replace TOOLBAR_TOP_WIDGET.
(free_frame_tool_bar, xg_change_toolbar_position ): Replace
TOOLBAR_TOP_WIDGET.
(xg_initialize): Remove tearoff code.
* src/gtkutil.h (xg_have_tear_offs): Remove declaration.
* src/xmenu.c (set_frame_menubar): Remove GTK block that calls
xg_have_tear_offs.
* src/xterm.h (handlebox_widget): Remove.
Origin: upstream, commit:
3f4c6d52d345999938bc2d4a53246af4c61ef176
Bug-Debian: http://bugs.debian.org/828000
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 4 Sep 2016 18:17:04 +0000 (13:17 -0500)]
debian/control: make Source-Version source:Version
Thanks to Guillem Jover for reporting the problem.
Closes: 833215
Rob Browning [Sun, 3 Jul 2016 16:36:28 +0000 (11:36 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-7 development
Rob Browning [Tue, 19 Jan 2016 00:00:29 +0000 (18:00 -0600)]
Update debian/changelog for 24.5+1-6 release
Rob Browning [Mon, 18 Jan 2016 23:51:31 +0000 (17:51 -0600)]
Fix a ppc64el, bss-related build problem
Builds on ppc64el were failing like this:
emacs: Program segment above .bss in
/«BUILDDIR»/emacs24-24.5+1/debian/build-x/src/temacs
Add these upstream patches to fix the problem:
0010-ELF-unexec-Correct-section-header-index.patch
0011-ELF-unexec-Tidy-code.patch
0012-ELF-unexec-Merge-Alpha-and-MIPS-COFF-debug-handling.patch
0013-ELF-unexec-Symbol-table-patching.patch
0014-ELF-unexec-_OBJC_-symbols-in-bss-sections.patch
0015-ELF-unexec-R_-_NONE-relocs.patch
0016-ELF-unexec-Drive-from-PT_LOAD-header-rather-than-sec.patch
0017-ELF-unexec-Don-t-insert-a-new-section.patch
0018-src-unexelf.c-NEW_PROGRAM_H-Remove-unused-macro-Bug-.patch
0019-ELF-unexec-align-section-header.patch
Thanks to Paul Eggert <eggert@cs.ucla.edu> for help locating the set
of patches, and Esa Peuha <esa.peuha@gmail.com> for reporting the
problem.
Closes: 808347
Rob Browning [Mon, 18 Jan 2016 21:20:51 +0000 (15:20 -0600)]
Merge ppc64el build (bss) fixes from emacs-25
Paul Eggert [Tue, 17 Nov 2015 01:48:08 +0000 (17:48 -0800)]
ELF unexec: align section header
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [10/10]:
ELF unexec: align section header
This ports the recent unexelf.c changes to Fedora x86-64
when configured with GCC’s -fsanitize=undefined option.
* src/unexelf.c (unexec): Align new_data2_size to a multiple
of ElfW (Shdr)’s alignment, so that NEW_SECTION_H returns a
pointer aligned appropriately for its type.
Origin: upstream, commit:
c9fd597a4cffcae873b25381ee8cc755f0debe95
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Paul Eggert [Sun, 8 Nov 2015 17:36:14 +0000 (09:36 -0800)]
* src/unexelf.c (NEW_PROGRAM_H): Remove unused macro (Bug#20614).
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [9/10]:
* src/unexelf.c (NEW_PROGRAM_H): Remove unused macro (Bug#20614).
Origin: upstream, commit:
2ce0c0674eba9179ba57c537e387bc3f7b0e5b63
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:29:00 +0000 (09:29 -0800)]
ELF unexec: Don't insert a new section
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [8/10]:
ELF unexec: Don't insert a new section
Reuse the .bss section instead, making it SHT_PROGBITS. This way we
don't need to mess with symbol st_shndx, or section sh_link and
sh_info.
This does lead to eu-elflint complaints about symbols defined in .bss
with a needed version, because normally it is undefined symbols that
have needed versions; Defined symbols have version definitions.
The exception is symbols defined by the linker in .dynbss for
variables copied from a shared library in order to avoid text
relocations, with copy relocs to copy their initial values from the
shared library. These symbols are both defined and have needed
versions, and eu-elflink only expects to see them in SHT_NOBITS
sections. Of course there is no real problem with having such symbols
in SHT_PROGBITS sections. glibc ld.so handles them fine.
* unexelf.c: Delete outdated comments.
(PATCH_INDEX): Delete.
(find_section): Delete.
(unexec): Don't add a new section. Instead reuse the last bss
section, extending it to cover dumped data. Make bss sections
SHT_PROGBITS. Remove all patching of sh_link, sh_info and
st_shndx. Rename bss sections.
Origin: upstream, commit:
3008c521740c5ad46a4eaf343b438b02c25e4de5
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:29:00 +0000 (09:29 -0800)]
ELF unexec: Drive from PT_LOAD header rather than sections
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [7/10]:
ELF unexec: Drive from PT_LOAD header rather than sections
This rewrites bss handling in the ELF unexec code. Finding bss
sections by name results in complicated code that
- does not account for all names of possible bss sections,
- assumes specific ordering of bss sections,
- can wrongly choose a SHT_NOBITS section not in the bss segment,
- incorrectly calculates bss size (no accounting for alignment gaps),
- assumes .data and .bss are in the same segment.
All of these problems and more are solved by finding the bss segment
in PT_LOAD headers, ie. the address range included in p_memsz but not
p_filesz of the last PT_LOAD header, then matching SHT_NOBITS sections
in that address range.
* unexelf.c: Delete old ppc comment.
(OLD_PROGRAM_H): Define.
(round_up): Delete.
(unexec): Don't search for bss style sections by name. Instead,
use the last PT_LOAD header address range covered by p_memsz
but not p_filesz and match any SHT_NOBITS section in that
address range. Simplify initialisation of section header vars.
Don't assume that section headers are above bss segment. Move
copying of bss area out of section loop. Align .data2 section
to 1, since it now covers the entire bss area. For SHT_NOBITS
sections in the bss segment, leave sh_addr and sh_addralign
unchanged, but correct sh_offset. Clear memory corresponding
to SHT_NOBITS .plt section. Delete comment and hacks for
sections partly overlapping bss range now that the full range
is properly calculated. Delete now dead .sbss code.
(Bug#20614)
Origin: upstream, commit:
0d6442265e5b709af5eebedf8f0d6b82974f4c31
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:29:00 +0000 (09:29 -0800)]
ELF unexec: R_*_NONE relocs
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [6/10]:
ELF unexec: R_*_NONE relocs
These should be ignored on all targets.
* unexelf.c (unexec): Ignore R_*_NONE relocs for any target,
not just Alpha. Comment on reloc size assumption.
Origin: upstream, commit:
8285c2ab8050de218c0c06182659ee0a7b23a0f6
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:29:00 +0000 (09:29 -0800)]
ELF unexec: _OBJC_ symbols in bss sections
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [5/10]:
ELF unexec: _OBJC_ symbols in bss sections
This code assumed that there was only one bss section. Rather than
checking for a particular index, check the section type. Also, handle
the possibility that the section was SHT_NOBITS originally and is
unchanged, in which case no clearing is needed (and sh_offset isn't
necessarily valid, which can lead to a wild memset).
* unexelf.c (unexec): Properly handle _OBJC_ symbols in bss sections.
Origin: upstream, commit:
3ff9fc0e8d738be5004c65c3be314af9aca68148
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:29:00 +0000 (09:29 -0800)]
ELF unexec: Symbol table patching
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [4/10]:
ELF unexec: Symbol table patching
No st_shndx value larger than SHN_LORESERVE should be changed.
* unexelf.c (unexec): Don't adjust any st_shndx larger than
SHN_LORESERVE. Error on SHN_XINDEX.
Origin: upstream, commit:
190b968f189cb7d06223bb39045ec9055df67f68
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:28:59 +0000 (09:28 -0800)]
ELF unexec: Merge Alpha and MIPS COFF debug handling
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [3/10]:
ELF unexec: Merge Alpha and MIPS COFF debug handling
* unexelf.c (unexec): Merge Alpha and MIPS COFF debug handling.
Don't find .mdebug section index, find the section in the loop.
Allow for unlikely possibility that .mdebug is located at sh_offset
before bss segment, by calculating move from difference in
sh_offset rather than just assuming new_data2_size. Simplify
cbLineOffset handling.
Origin: upstream, commit:
47c6e3035b8182c6436de4673473de7824ad59f1
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:28:59 +0000 (09:28 -0800)]
ELF unexec: Tidy code
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [2/10]:
ELF unexec: Tidy code
Separate out some of the more mechanical changes so following patches
are smaller.
* unexelf.c (unexec): Rearrange initialisation of program
header vars. Use pointer vars in loops rather than indexing
section header array via macros. Simplify _OBJC_ sym code
and reloc handling code.
Origin: upstream, commit:
856f4eaba8a76953e0bbcfc7ebb0ca4f2e3cf351
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Alan Modra [Sun, 8 Nov 2015 17:28:59 +0000 (09:28 -0800)]
ELF unexec: Correct section header index
Emacs should build on ppc64el. A problem with the bss has been fixed.
This upstream patch has been added [1/10]:
ELF unexec: Correct section header index
First a small fix. The code incorrectly uses "NEW_SECTION_H (n)" when
it should have been using "NEW_SECTION_H (nn)" to find the name of the
section currently being processed. Of course, before the bss
sections, n and nn have the same value, so this doesn't matter except
in the case of .sbss. For .sbss this probably meant .bss (most likely
the next section) was copied from memory. A later patch removes the
bogus .sbss handling anyway.
* unexelf.c (unexec): Use correct index to look up names.
Origin: upstream, commit:
0bcd08ef052bca9b8d08696068c2a0c387d0dd56
Bug: http://debbugs.gnu.org/20614
Bug-Debian: http://bugs.debian.org/808347
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Mon, 18 Jan 2016 20:31:17 +0000 (14:31 -0600)]
Adjust debian/changelog for UNRELEASED 24.5+1-6 development
Rob Browning [Fri, 27 Nov 2015 20:30:53 +0000 (14:30 -0600)]
Update debian/changelog for 24.5+1-5 release
Rob Browning [Fri, 27 Nov 2015 20:23:45 +0000 (14:23 -0600)]
Only test timestamp preservation for $(flavor)-el
Only check el.gz timestamp preservation when $(flavor)-el is one of
the packages being built (so the canary file will actually be there),
but go ahead and fix up the timestamps across all packages.
Thanks to David Matthew Mattli <dmm@mattli.us> for reporting the
problem.
Closes: 805904
Rob Browning [Fri, 27 Nov 2015 18:42:19 +0000 (12:42 -0600)]
Adjust debian/changelog for UNRELEASED 24.5+1-5 development
Rob Browning [Sat, 7 Nov 2015 19:22:04 +0000 (13:22 -0600)]
Update debian/changelog for 24.5+1-4 release
Rob Browning [Sat, 7 Nov 2015 19:18:39 +0000 (13:18 -0600)]
Ensure elc timestamps are newer than el files
Since strip-nodeterminism changes the *.el.gz file timestamps, restore
the timestamps after it runs. Otherwise, Emacs will think that
corresponding .elc files are stale.
Thanks to Yuri D'Elia <wavexx@thregr.org> for reporting the problem.
Closes: 803060
Rob Browning [Sat, 31 Oct 2015 19:26:24 +0000 (14:26 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-4 development
Rob Browning [Sat, 24 Oct 2015 19:45:10 +0000 (14:45 -0500)]
Update debian/changelog for 24.5+1-3 release
Rob Browning [Sat, 24 Oct 2015 19:30:25 +0000 (14:30 -0500)]
emacs-common: recommend emacs-el
Without it, important bits of Emacs don't work (i.e. C-h f, etc.), and
it's not likely to be a significant burden these days.
Rob Browning [Sat, 24 Oct 2015 15:54:53 +0000 (10:54 -0500)]
Remove redundant libtiff-dev dependency.
Rob Browning [Sun, 18 Oct 2015 22:19:28 +0000 (17:19 -0500)]
Suggest ncurses-term, needed by term mode
Thanks to Jorge Morais for reporting the problem and era+debian@iki.fi
for forwarding it to Debian.
Closes: 790402
Rob Browning [Sun, 18 Oct 2015 17:03:08 +0000 (12:03 -0500)]
Add upstream StartupWMClass/Keywords to *.desktop
Copy them from the upstream etc/emacs.desktop.
Rob Browning [Sun, 18 Oct 2015 16:55:32 +0000 (11:55 -0500)]
Split desktop file into term and non-term versions
Thanks to Norbert Preining <preining@logic.at> for reporting the
problem.
Closes: 799935
Rob Browning [Sun, 18 Oct 2015 16:14:24 +0000 (11:14 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-3 development
Rob Browning [Sat, 19 Sep 2015 19:51:10 +0000 (14:51 -0500)]
Update debian/changelog for 24.5+1-2 release
Rob Browning [Sat, 19 Sep 2015 19:47:57 +0000 (14:47 -0500)]
Don't hang during large yanks
Add 0009-Emacs-should-no-longer-hang-during-large-yanks.patch to
incorporate the relevant upstream patch. Thanks to Mike Crowe
<mac@mcrowe.com> for reporting the problem and tracking down the fix.
Closes: 795909
Paul Eggert [Fri, 17 Jul 2015 18:54:24 +0000 (11:54 -0700)]
Emacs should no longer hang during large yanks
This upstream patch has been added:
Fix hang with large yanks
Backport of master commit
0592cefd03f1de2f04b721d07a16e6e0a9e48f73.
This should fix the bug fixed by Mike Crowe's patch in:
https://lists.gnu.org/archive/html/emacs-devel/2015-07/msg00106.html
A problem in this area has been reported by several users; see
Bug#16737, Bug#17101, Bug#17026, Bug#17172, Bug#19320, Bug#20283.
This fix differs from Mike Crowe's patch in that it should avoid a
race condition that could lose SIGIO signals. ignore_sigio dates
back to the 1980s when some platforms couldn't block signals, and
could only ignore them, which led to races when signals arrived
while being ignored. We shouldn't have to worry about those old
platforms now.
* src/dispextern.h, src/sysdep.c (ignore_sigio): Remove.
* src/emacs.c (shut_down_emacs):
Don't call ignore_sigio; unrequest_sigio should suffice.
* src/keyboard.c (kbd_buffer_store_buffered_event):
Use unrequest_sigio, not ignore_sigio.
(kbd_buffer_get_event):
Call request_sigio when getting the ball rolling again.
Origin: upstream, commit:
a27ae9d7650a1230d4359eaf0a949f827315a6d2
Bug: http://debbugs.gnu.org/16737
Bug-Debian: http://bugs.debian.org/795909
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 19 Sep 2015 19:46:40 +0000 (14:46 -0500)]
Don't assume grep supports GREP_OPTIONS
Add 0008-Emacs-won-t-assume-grep-supports-GREP_OPTIONS.patch to
incorporate the relevant upstream patch. Thanks to Bob Proulx
<bob@proulx.com> for reporting the problem, and Ben Finney
<ben+debian@benfinney.id.au> for tracking down the fix.
Closes: 793741
Paul Eggert [Wed, 17 Sep 2014 00:07:12 +0000 (17:07 -0700)]
Emacs won't assume grep supports GREP_OPTIONS
This upstream patch has been added:
Don't assume 'grep' supports GREP_OPTIONS.
The GREP_OPTIONS environment variable is planned to be marked
obsolescent in GNU grep, due to problems in its use, so stop
relying on it.
* progmodes/grep.el (grep-highlight-matches): Document this.
(grep-process-setup): Do not set GREP_OPTIONS.
(grep-compute-defaults): Use an explicit --color option if supported.
Origin: upstream, commit:
2e4c2fe2787785a421f256541de642976e9bd90b
Bug: http://debbugs.gnu.org/19247
Bug-Debian: http://bugs.debian.org/793741
Added-by: Rob Browning <rlb@defaultvalue.org>
David Bremner [Sat, 10 Jan 2015 22:23:46 +0000 (23:23 +0100)]
Explicity specify QUILT_PATCHES_PREFIX in rules
The current use relies on the names of patches being prefixed with
debian/patches, which doesn't seem to be completely reliable (e.g. it
doesn't happen in a wheezy build environment). The environment
variable QUILT_PATCHES_PREFIX is documented to do this.
Closes: 775068
Rob Browning [Sat, 5 Sep 2015 17:55:26 +0000 (12:55 -0500)]
Update .desktop file and add terminal flavor
Rob Browning [Sat, 5 Sep 2015 17:55:03 +0000 (12:55 -0500)]
Remove .menu file as per TC resolution of #741573
Martin Račák [Thu, 17 Sep 2015 18:30:39 +0000 (20:30 +0200)]
emacsVER.desktop: don't use absolute path to icon
Closes: 778884
Rob Browning [Sat, 19 Sep 2015 17:27:19 +0000 (12:27 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-2 development
Rob Browning [Wed, 17 Jun 2015 05:12:40 +0000 (00:12 -0500)]
Update debian/changelog for 24.5+1-1 release
Rob Browning [Sun, 14 Jun 2015 20:40:13 +0000 (15:40 -0500)]
Update debian/copyright* for 24.5
Rob Browning [Sun, 14 Jun 2015 20:03:01 +0000 (15:03 -0500)]
Merge upstream version 24.5
Remove redundant patches:
0008-A-race-to-create-info-has-been-eliminated.patch
0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
Rob Browning [Wed, 22 Oct 2014 00:10:17 +0000 (19:10 -0500)]
Don't try to build src/macuvs.h (via IVD_Sequences.txt)
These are OS X specific, and were removed for now, due to uncertainty
over the licensing.
Rob Browning [Tue, 5 Apr 2011 03:46:29 +0000 (22:46 -0500)]
Look for NEWS in order to find etc/ rather than GNU.
Emacs will now look for NEWS in order to find etc/ rather than GNU.
Since Debian doesn't include GNU in the Debian packages (the common
licenses are in /usr/share/common-licenses), Emacs will now look for
NEWS to find the etc directory instead of GNU.
Provided-by: Sven Joachim <svenjoac@gmx.de>
Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
Date: Mon, 28 Apr 2008 11:20:23 +0200
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific
Rob Browning [Tue, 5 Apr 2011 03:46:28 +0000 (22:46 -0500)]
Modify the output of (version) to indicate Debian modifications.
The output of (version) has been modified to indicate Debian modifications.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 5 Apr 2011 03:46:25 +0000 (22:46 -0500)]
Adjust documentation references for Debian.
Various documentation references have been adjusted for Debian.
References to /usr/local/... have been changed to /usr/... as
appropriate, etc.
Rob Browning [Tue, 5 Apr 2011 03:46:24 +0000 (22:46 -0500)]
Remove files that appear to be incompatible with the DFSG
Files that appear to be incompatible with the DFSG have been removed.
A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.
In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.
The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: new
Rob Browning [Tue, 5 Apr 2011 03:46:22 +0000 (22:46 -0500)]
Run debian-startup and set debian-emacs-flavor.
Emacs runs debian-startup and sets debian-emacs-flavor.
* Emacs runs debian-startup during the startup process unless
site-run-file is false.
* The global variable debian-emacs-flavor is bound to 'emacs24.
Author: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 7 Apr 2013 20:03:05 +0000 (15:03 -0500)]
Prefer /usr/share/info/emacs-24 over /usr/share/info.
Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info.
The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.
Rob Browning [Sun, 14 Jun 2015 19:52:39 +0000 (14:52 -0500)]
record new upstream branch
Rob Browning [Sun, 14 Jun 2015 19:47:29 +0000 (14:47 -0500)]
Merge tag 'emacs-24.5' into deb/emacs24/d/sid/upstream
Conflicts:
doc/emacs/ChangeLog
doc/emacs/Makefile.in
doc/emacs/abbrevs.texi
doc/emacs/ack.texi
doc/emacs/anti.texi
doc/emacs/arevert-xtra.texi
doc/emacs/basic.texi
doc/emacs/buffers.texi
doc/emacs/building.texi
doc/emacs/cal-xtra.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/commands.texi
doc/emacs/custom.texi
doc/emacs/dired-xtra.texi
doc/emacs/dired.texi
doc/emacs/display.texi
doc/emacs/emacs-xtra.texi
doc/emacs/emacs.texi
doc/emacs/emerge-xtra.texi
doc/emacs/entering.texi
doc/emacs/files.texi
doc/emacs/fixit.texi
doc/emacs/fortran-xtra.texi
doc/emacs/frames.texi
doc/emacs/glossary.texi
doc/emacs/gnu.texi
doc/emacs/help.texi
doc/emacs/indent.texi
doc/emacs/killing.texi
doc/emacs/kmacro.texi
doc/emacs/m-x.texi
doc/emacs/macos.texi
doc/emacs/maintaining.texi
doc/emacs/makefile.w32-in
doc/emacs/mark.texi
doc/emacs/mini.texi
doc/emacs/misc.texi
doc/emacs/modes.texi
doc/emacs/msdog-xtra.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/package.texi
doc/emacs/picture-xtra.texi
doc/emacs/programs.texi
doc/emacs/regs.texi
doc/emacs/rmail.texi
doc/emacs/screen.texi
doc/emacs/search.texi
doc/emacs/sending.texi
doc/emacs/text.texi
doc/emacs/trouble.texi
doc/emacs/vc-xtra.texi
doc/emacs/vc1-xtra.texi
doc/emacs/windows.texi
doc/emacs/xresources.texi
doc/lispintro/ChangeLog
doc/lispintro/Makefile.in
doc/lispintro/README
doc/lispintro/cons-1.eps
doc/lispintro/cons-2.eps
doc/lispintro/cons-2a.eps
doc/lispintro/cons-3.eps
doc/lispintro/cons-4.eps
doc/lispintro/cons-5.eps
doc/lispintro/drawers.eps
doc/lispintro/emacs-lisp-intro.texi
doc/lispintro/lambda-1.eps
doc/lispintro/lambda-2.eps
doc/lispintro/lambda-3.eps
doc/lispintro/makefile.w32-in
doc/lispref/ChangeLog
doc/lispref/Makefile.in
doc/lispref/README
doc/lispref/abbrevs.texi
doc/lispref/anti.texi
doc/lispref/back.texi
doc/lispref/backups.texi
doc/lispref/buffers.texi
doc/lispref/commands.texi
doc/lispref/compile.texi
doc/lispref/control.texi
doc/lispref/customize.texi
doc/lispref/debugging.texi
doc/lispref/display.texi
doc/lispref/edebug.texi
doc/lispref/elisp.texi
doc/lispref/errors.texi
doc/lispref/eval.texi
doc/lispref/files.texi
doc/lispref/frames.texi
doc/lispref/functions.texi
doc/lispref/hash.texi
doc/lispref/help.texi
doc/lispref/hooks.texi
doc/lispref/internals.texi
doc/lispref/intro.texi
doc/lispref/keymaps.texi
doc/lispref/lay-flat.texi
doc/lispref/lists.texi
doc/lispref/loading.texi
doc/lispref/macros.texi
doc/lispref/makefile.w32-in
doc/lispref/maps.texi
doc/lispref/markers.texi
doc/lispref/minibuf.texi
doc/lispref/modes.texi
doc/lispref/nonascii.texi
doc/lispref/numbers.texi
doc/lispref/objects.texi
doc/lispref/os.texi
doc/lispref/package.texi
doc/lispref/positions.texi
doc/lispref/processes.texi
doc/lispref/searching.texi
doc/lispref/sequences.texi
doc/lispref/streams.texi
doc/lispref/strings.texi
doc/lispref/symbols.texi
doc/lispref/syntax.texi
doc/lispref/text.texi
doc/lispref/tips.texi
doc/lispref/two-volume-cross-refs.txt
doc/lispref/two-volume.make
doc/lispref/variables.texi
doc/lispref/windows.texi
doc/misc/ada-mode.texi
doc/misc/auth.texi
doc/misc/autotype.texi
doc/misc/bovine.texi
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/cl.texi
doc/misc/dbus.texi
doc/misc/dired-x.texi
doc/misc/ebrowse.texi
doc/misc/ede.texi
doc/misc/ediff.texi
doc/misc/edt.texi
doc/misc/eieio.texi
doc/misc/emacs-gnutls.texi
doc/misc/emacs-mime.texi
doc/misc/epa.texi
doc/misc/erc.texi
doc/misc/ert.texi
doc/misc/eshell.texi
doc/misc/eudc.texi
doc/misc/eww.texi
doc/misc/flymake.texi
doc/misc/forms.texi
doc/misc/gnus-coding.texi
doc/misc/gnus-faq.texi
doc/misc/gnus-news.texi
doc/misc/gnus.texi
doc/misc/htmlfontify.texi
doc/misc/idlwave.texi
doc/misc/ido.texi
doc/misc/info.texi
doc/misc/mairix-el.texi
doc/misc/message.texi
doc/misc/mh-e.texi
doc/misc/newsticker.texi
doc/misc/nxml-mode.texi
doc/misc/octave-mode.texi
doc/misc/org.texi
doc/misc/pcl-cvs.texi
doc/misc/pgg.texi
doc/misc/rcirc.texi
doc/misc/reftex.texi
doc/misc/remember.texi
doc/misc/sasl.texi
doc/misc/sc.texi
doc/misc/sem-user.texi
doc/misc/semantic.texi
doc/misc/ses.texi
doc/misc/sieve.texi
doc/misc/smtpmail.texi
doc/misc/speedbar.texi
doc/misc/srecode.texi
doc/misc/todo-mode.texi
doc/misc/tramp.texi
doc/misc/trampver.texi
doc/misc/url.texi
doc/misc/vip.texi
doc/misc/viper.texi
doc/misc/widget.texi
doc/misc/wisent.texi
doc/misc/woman.texi
etc/GNU
Rob Browning [Sun, 14 Jun 2015 19:05:02 +0000 (14:05 -0500)]
Adjust debian/changelog for UNRELEASED 24.5+1-1 development
Rob Browning [Sun, 14 Jun 2015 17:52:12 +0000 (12:52 -0500)]
merge deb/emacs24/d/sid/dpm-patched into deb/emacs24/d/sid/master
Migrate from the old savannah.gnu.org bzr->git mirror to the new
official git repository.
Glenn Morris [Mon, 10 Nov 2014 07:12:37 +0000 (23:12 -0800)]
Nil load-path elements shouldn't crash Emacs
This upstream patches has been added:
* lisp/startup.el (command-line): Handle nil elements in load-path.
Origin: upstream, http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=
edfdb22f674312389ccf5d5e37efa4d3f1516994
Bug-Debian: http://bugs/debian.org/768751
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Thu, 23 Oct 2014 15:24:22 +0000 (10:24 -0500)]
A race to create info/ has been eliminated
Previously something like "make -j2 info" might fail because there was
a race to create info/. This backport was adapted from the broader
patch listed below.
Origin: backport, commit: r118181,
a385f9e187ceec0610f000158305c9d5cb987dbd
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Wed, 22 Oct 2014 00:10:17 +0000 (19:10 -0500)]
Don't try to build src/macuvs.h (via IVD_Sequences.txt)
These are OS X specific, and were removed for now, due to uncertainty
over the licensing.
Rob Browning [Tue, 5 Apr 2011 03:46:29 +0000 (22:46 -0500)]
Look for NEWS in order to find etc/ rather than GNU.
Emacs will now look for NEWS in order to find etc/ rather than GNU.
Since Debian doesn't include GNU in the Debian packages (the common
licenses are in /usr/share/common-licenses), Emacs will now look for
NEWS to find the etc directory instead of GNU.
Provided-by: Sven Joachim <svenjoac@gmx.de>
Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
Date: Mon, 28 Apr 2008 11:20:23 +0200
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: Debian specific
Rob Browning [Tue, 5 Apr 2011 03:46:28 +0000 (22:46 -0500)]
Modify the output of (version) to indicate Debian modifications.
The output of (version) has been modified to indicate Debian modifications.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 5 Apr 2011 03:46:25 +0000 (22:46 -0500)]
Adjust documentation references for Debian.
Various documentation references have been adjusted for Debian.
References to /usr/local/... have been changed to /usr/... as
appropriate, etc.
Rob Browning [Tue, 5 Apr 2011 03:46:24 +0000 (22:46 -0500)]
Remove files that appear to be incompatible with the DFSG
Files that appear to be incompatible with the DFSG have been removed.
A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.
In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.
The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.
Author: Rob Browning <rlb@defaultvalue.org>
Added-by: Rob Browning <rlb@defaultvalue.org>
Status: new
Rob Browning [Tue, 5 Apr 2011 03:46:22 +0000 (22:46 -0500)]
Run debian-startup and set debian-emacs-flavor.
Emacs runs debian-startup and sets debian-emacs-flavor.
* Emacs runs debian-startup during the startup process unless
site-run-file is false.
* The global variable debian-emacs-flavor is bound to 'emacs24.
Author: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 7 Apr 2013 20:03:05 +0000 (15:03 -0500)]
Prefer /usr/share/info/emacs-24 over /usr/share/info.
Emacs will prefer /usr/share/info/emacs-24 over /usr/share/info.
The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
/usr/share/info.
Rob Browning [Sun, 14 Jun 2015 17:51:01 +0000 (12:51 -0500)]
record new upstream branch
Rob Browning [Sun, 14 Jun 2015 17:41:01 +0000 (12:41 -0500)]
Remove DFSG incompatible files
Remove files that are incompatible with the Debian Free Software
Guidelines.
Rob Browning [Sun, 14 Jun 2015 17:27:53 +0000 (12:27 -0500)]
Adjust debian/changelog for UNRELEASED 24.4+2-1 development
Nicolas Petton [Mon, 6 Apr 2015 18:20:08 +0000 (20:20 +0200)]
* lisp/ChangeLog: Remove a duplicate
Nicolas Petton [Sun, 5 Apr 2015 15:23:28 +0000 (17:23 +0200)]
lisp/ldefs-boot.el: Update for the 24.5 release
Nicolas Petton [Thu, 2 Apr 2015 07:36:15 +0000 (09:36 +0200)]
Update the 24.5 release date in all ChangeLog files
Glenn Morris [Fri, 3 Apr 2015 15:16:23 +0000 (11:16 -0400)]
* admin/make-tarball.txt: Copyedits.
Glenn Morris [Fri, 3 Apr 2015 15:11:15 +0000 (11:11 -0400)]
; ChangeLog fix
Alan Mackenzie [Fri, 3 Apr 2015 12:22:45 +0000 (12:22 +0000)]
Revert "CC Mode: Stop Font Lock forcing fontification from BOL. Bug#19669."
This reverts commit
d69e9f1c24f37f36af33b0468c5a4e100dbb09b6.
Nicolas Petton [Wed, 1 Apr 2015 20:27:47 +0000 (22:27 +0200)]
* etc/AUTHORS: Update the AUTHORS file
Michael Albinus [Wed, 1 Apr 2015 15:04:07 +0000 (17:04 +0200)]
Fix tramp-tests.el
* automated/tramp-tests.el (tramp-test06-directory-file-name):
Fix docstring and last test.
Michael Albinus [Wed, 1 Apr 2015 07:31:20 +0000 (09:31 +0200)]
Fix bug#20233, do not merge with master
* lisp/net/tramp.el (tramp-handle-unhandled-file-name-directory):
Return nil when required by the spec. (Bug#20233)
Jan D [Sun, 29 Mar 2015 19:16:23 +0000 (21:16 +0200)]
Fixes: debbugs:19175
* gtkutil.c (xg_display_open):
* xterm.c (x_display_ok, x_term_init): Block SIGIO when opening
a display.
Eli Zaretskii [Sun, 29 Mar 2015 16:41:04 +0000 (19:41 +0300)]
Fix the preamble text of the DIR file we install (Bug#20213)
build-aux/dir_top (File): Fix the description of selecting a
menu item by its number.
Eli Zaretskii [Sat, 28 Mar 2015 17:37:47 +0000 (20:37 +0300)]
src/w32proc.c: Describe in a comment w32 subprocess implementation.
Nicolas Petton [Fri, 27 Mar 2015 08:52:01 +0000 (09:52 +0100)]
Bump version to 24.5 for the release-candidate
Stefan Monnier [Thu, 26 Mar 2015 19:17:51 +0000 (15:17 -0400)]
(url-insert-file-contents): Set buffer-file-coding-system
Fixes: debbugs:20010
* lisp/url/url-handlers.el (url-insert-file-contents): Call
after-insert-file-set-coding like insert-file-contents, to set
buffer-file-coding-system. [Backport]
Stefan Monnier [Thu, 26 Mar 2015 13:36:24 +0000 (09:36 -0400)]
* smie.el (smie*ward-sexp-command): Don't pretend the arg is optional
Fixes: debbugs:20205
* lisp/emacs-lisp/smie.el (smie-backward-sexp-command)
(smie-forward-sexp-command): Don't pretend the arg is optional.
Martin Rudalics [Wed, 25 Mar 2015 10:17:30 +0000 (11:17 +0100)]
Don't round up scroll bar width with GTK3 (Bug#20182).
* gtkutil.c (update_theme_scrollbar_width): Don't round up
scroll bar width with GTK3 (Bug#20182).
Glenn Morris [Wed, 25 Mar 2015 05:42:42 +0000 (22:42 -0700)]
* doc/lispref/objects.texi (Equality Predicates): Fix typo in example.
Eli Zaretskii [Mon, 23 Mar 2015 16:39:38 +0000 (18:39 +0200)]
Another minor improvement in ELisp manual (Bug#20168)
doc/lispref/commands.texi (Accessing Mouse): More accurate description
of 'posn-object-x-y'.
Eli Zaretskii [Mon, 23 Mar 2015 16:35:03 +0000 (18:35 +0200)]
Improve docs of 'posn-actual-col-row' (Bug#20169)
doc/lispref/commands.texi (Accessing Mouse): Expand documentation of
'posn-actual-col-row'.
Eli Zaretskii [Mon, 23 Mar 2015 16:23:47 +0000 (18:23 +0200)]
Minor documentation fix in ELisp manual (Bug#20174)
doc/lispref/commands.texi (Event Input Misc): Fix incorrect usage of @code.
Stefan Monnier [Mon, 23 Mar 2015 13:12:52 +0000 (09:12 -0400)]
* display.texi (Useless Whitespace): Fix thinko.
Reported by Fabio Pesari.
Andreas Schwab [Mon, 23 Mar 2015 10:55:24 +0000 (11:55 +0100)]
* configure.ac: Fix jpeg version check to work with gcc >= 5.
Ben Bacarisse [Mon, 23 Mar 2015 08:02:01 +0000 (08:02 +0000)]
lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
Glenn Morris [Mon, 23 Mar 2015 00:33:49 +0000 (17:33 -0700)]
authors.el small additions
* lisp/emacs-lisp/authors.el (authors-aliases)
(authors-obsolete-files-regexps): Additions.
Glenn Morris [Mon, 23 Mar 2015 00:10:10 +0000 (17:10 -0700)]
* etc/PROBLEMS: Add entry about dir-locals and some auto-mounters.
Jan D [Sun, 22 Mar 2015 18:31:46 +0000 (19:31 +0100)]
Fixes: debbugs:18939
* simple.el (deactivate-mark): Only modify PRIMARY if we own PRIMARY.
Glenn Morris [Sun, 22 Mar 2015 18:11:27 +0000 (11:11 -0700)]
ChangeLog fix
No need to merge to trunk, since it corrects a backported entry that
should not appear in trunk.
Martin Rudalics [Sun, 22 Mar 2015 11:40:21 +0000 (12:40 +0100)]
In `debug' don't try using window on inaccessible frame (Bug#17170).
* emacs-lisp/debug.el (debug): Don't try using "previous"
window when its not live or on an invisible frame (Bug#17170).